From 2a9551f54e1751ca85ad981bc4dc514ec4196b2e Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@columbia.edu>
Date: Mon, 17 Nov 2003 20:57:40 +0000
Subject: [PATCH] Check for freetype headers the way freetype wants us to.

2003-11-17  Noah Levitt  <nlevitt@columbia.edu>

	* configure.in: Check for freetype headers the way freetype
	wants us to.
---
 ChangeLog          | 5 +++++
 ChangeLog.pre-2-10 | 5 +++++
 ChangeLog.pre-2-4  | 5 +++++
 ChangeLog.pre-2-6  | 5 +++++
 ChangeLog.pre-2-8  | 5 +++++
 configure.in       | 3 ++-
 6 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7fbf5fa7c8..da18bc60af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-17  Noah Levitt  <nlevitt@columbia.edu>
+
+	* configure.in: Check for freetype headers the way freetype
+	wants us to.
+
 2003-11-17  Mark McLoughlin  <mark@skynet.ie>
 
 	Patch from Jaiserca <jaiserca@inf.upv.es> to add a
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7fbf5fa7c8..da18bc60af 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2003-11-17  Noah Levitt  <nlevitt@columbia.edu>
+
+	* configure.in: Check for freetype headers the way freetype
+	wants us to.
+
 2003-11-17  Mark McLoughlin  <mark@skynet.ie>
 
 	Patch from Jaiserca <jaiserca@inf.upv.es> to add a
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7fbf5fa7c8..da18bc60af 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2003-11-17  Noah Levitt  <nlevitt@columbia.edu>
+
+	* configure.in: Check for freetype headers the way freetype
+	wants us to.
+
 2003-11-17  Mark McLoughlin  <mark@skynet.ie>
 
 	Patch from Jaiserca <jaiserca@inf.upv.es> to add a
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7fbf5fa7c8..da18bc60af 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2003-11-17  Noah Levitt  <nlevitt@columbia.edu>
+
+	* configure.in: Check for freetype headers the way freetype
+	wants us to.
+
 2003-11-17  Mark McLoughlin  <mark@skynet.ie>
 
 	Patch from Jaiserca <jaiserca@inf.upv.es> to add a
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7fbf5fa7c8..da18bc60af 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2003-11-17  Noah Levitt  <nlevitt@columbia.edu>
+
+	* configure.in: Check for freetype headers the way freetype
+	wants us to.
+
 2003-11-17  Mark McLoughlin  <mark@skynet.ie>
 
 	Patch from Jaiserca <jaiserca@inf.upv.es> to add a
diff --git a/configure.in b/configure.in
index 67aadaeb87..da44bef231 100644
--- a/configure.in
+++ b/configure.in
@@ -984,7 +984,8 @@ if test "x$gdktarget" = "xlinux-fb" || test "x$gdktarget" = "xx11" ; then
 
       AC_MSG_CHECKING([For sufficiently new FreeType (at least 2.0.1)])
       AC_TRY_COMPILE([
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 #include FT_ERRORS_H
     ],
 	             [(void)1;],:,have_freetype=false)
-- 
2.30.2